[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: 6969e6d1 am: c1b4d2a8 -s ours am: 3340ba95 -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: Ia1eccc97e967da632b4cb568f6dbe64cd3c9f46f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>