[automerger skipped] Merge changes from topic "am-fd9e5c86235941ed9ec147cbba4b4645" into tm-d1-dev-plus-aosp am: f426fb81bb -s ours am: 004bfd8a5e -s ours

am skip reason: Merged-In I0c77f2034e6abaf799201224e4056589af49fdce with SHA-1 9d23404365 is already in history. Merged-In was found from reverted change.

Reverted change: https://googleplex-android-review.googlesource.com/c/device/generic/goldfish/+/18916289

Original change: https://googleplex-android-review.googlesource.com/c/device/generic/goldfish/+/19151730

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