[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: cef86b0a am: 5ec66b32 -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: Ib2fc5d97b5a7a8baf72994e9cbbc7b578985b186
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>