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 am: f611ed00

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



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