[automerger skipped] Merge "Update emulator info." into tm-dev am: 95a48ded5c am: 4efb0a7912 am: a91f916144 -s ours am: 23c3694b6d -s ours

am skip reason: Merged-In Iebd6ec3d5e3bd371eb3ba1dc7c637095806d907d with SHA-1 5c5e354a14 is already in history

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

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