tree 70f5bfad76c1881c5f2d13b1cd370065ab47f129
parent 07ae3f16f72503bc71da41efddb08ecf68818249
parent aa2fb37b3e40141be5921584408171d506a3290b
author Xin Li <delphij@google.com> 1567718880 -0700
committer android-build-merger <android-build-merger@google.com> 1567718880 -0700

[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: 5811955a17 -s ours am: ad35c5b5e1
am: aa2fb37b3e

Change-Id: I70005d16c3b7aadbe0de2a5d5f6a020bfeacbd3c