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: f061ab35

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



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