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

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



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