[automerger skipped] Merge "Update emulator info." into tm-dev am: 95a48ded5c -s ours am: b9f13626fc -s ours am: 846c6bd623 -s ours am: 500956eb92 -s ours

am skip reason: Merged-In Iebd6ec3d5e3bd371eb3ba1dc7c637095806d907d with SHA-1 3202bda5b9 is already in history

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

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