Merge changes from topic "am-96e5992b2dd4470eae48f4ad98b53c99" into stage-aosp-master am: cf3ad91aae -s ours
am skip reason: Merged-In Ib270c83d4f18dc7e301667733df8952f83581116 with SHA-1 28092bd22e is already in history
Original change: https://android-review.googlesource.com/c/platform/development/+/2186582
Change-Id: I11c61bc48ec60decaf1b855e609f203873df5e28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: