[automerger skipped] Merge "Keep overlay info for the android app info up to...

[automerger skipped] Merge "Keep overlay info for the android app info up to date" into tm-dev am: e0142a3d am: f061ab35 am: 0984e5ba -s ours am: c4eb602d -s ours

am skip reason: Merged-In I851ba79bed0c70ac40a615cbaac9ed1c92a5e800 with SHA-1 f9de5e97 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18609510



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