tree c42a90aacfe1c07af564ada7ea03e559767ab543
parent ed3c15d0b8363cc6174eaefdb6ddd877cf1bede0
parent b20db5b76e14c7836ce23a68998e73bbb7ebdea1
author Xin Li <delphij@google.com> 1567720138 -0700
committer android-build-merger <android-build-merger@google.com> 1567720138 -0700

[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: 048a25a0e6 -s ours am: d02c844385 am: 4a914a0c31
am: b20db5b76e -s ours
am skip reason: subject contains skip directive

Change-Id: I48dfaad38ee53dd0378aa13d7ace6d0db1b4b42f