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: I59a2137cc2f229273d045f581c88741f792876af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>