Manually merge AOSP master am: 892a2ff855 am: fdfef7058e

Original change: https://googleplex-android-review.googlesource.com/c/device/google/fuchsia/+/19608067

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