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

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



Change-Id: I5caec66010c10736668cfe5f912481465164d7ca
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>