tree 7adddd25c3a9aa5c83182abcb5852474669a65c4
parent acd73d054698f540f28fdd8ab91d6a9cc10c50df
parent debe20edd75048a46f726b42224afe13587c0a47
author Chiachang Wang <chiachangwang@google.com> 1605865316 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1605865316 +0000

[automerger skipped] Merge changes from topic "move_BSCH" am: 1b414d61b4 am: 2ea9048daa am: 7becf08476 am: debe20edd7 -s ours

am skip reason: Change-Id Ida30c877116090616d4bf3f87fdad835446dac84 with SHA-1 6a555279ec is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1503395

Change-Id: I619afbbffa4b9ed804475c994310fc9f73fca588