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

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



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