tree 1e54620dd15c819d5e94879836a7075a15c7d79c
parent 082323fe3296d355cfc0ad1c15028476b19cbc94
parent 1d8b9ccdc52de4d2a8b4771168829af127d5bf89
author Xin Li <delphij@google.com> 1567711413 -0700
committer android-build-merger <android-build-merger@google.com> 1567711413 -0700

[automerger skipped] DO NOT MERGE - Merge Android 10 into master
am: 1d8b9ccdc5 -s ours
am skip reason: subject contains skip directive

Change-Id: I5ac601c41633b046bea282bd96207225eee1c491