Merge "Don't re-prompt for VISUAL/AURAL after app upgrade" into tm-dev am: 0afa5059

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



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