Merge "Keep overlay info for the android app info up to date" into tm-dev am:...

Merge "Keep overlay info for the android app info up to date" into tm-dev am: e0142a3d am: 6969e6d1 am: cef86b0a

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



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