Merge "Merge "Don't re-prompt VISUAL/AURAL after app upgrade #2" into tm-dev...

Merge "Merge "Don't re-prompt VISUAL/AURAL after app upgrade #2" into tm-dev am: d5eda4bc am: 9920edd6" into tm-d1-dev-plus-aosp am: b1b39f42

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



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