Merge changes from topic "am-c3479d1074da4f49a5c817b8ee7f386a" into stage-aosp-master am: 9ea297d981 -s ours

am skip reason: Merged-In Ie82f2c3efcc88d788f6e914ae37b6a9d38955cb5 with SHA-1 fa6cbb870b is already in history

Original change: https://android-review.googlesource.com/c/device/common/+/2336993

Change-Id: Ia87e7b961c797b5f51c671da9a79e8e44dd1cf26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>