[automerger skipped] Merge changes from topic "am-c3479d1074da4f49a5c817b8ee7f386a" into stage-aosp-master am: 4f52b5713f -s ours am: 0d9fba824f -s ours

am skip reason: Merged-In I5be6e32d05aa219ae787cb5a3242a2cc4f9e87f4 with SHA-1 d97284de03 is already in history

Original change: https://android-review.googlesource.com/c/platform/development/+/2337855

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