tree c42a90aacfe1c07af564ada7ea03e559767ab543
parent 31f98139fef9bf73dd272e9f4eebf04deae68f4b
parent d02c844385d3237cb441cb3e49d0fb0ee973aa28
author Xin Li <delphij@google.com> 1567717180 -0700
committer android-build-merger <android-build-merger@google.com> 1567717180 -0700

[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: 048a25a0e6 -s ours
am: d02c844385

Change-Id: Ie5cb9c99e0796f2bcb863eb4fe5887e520c68d67