Merge "Revert "Don't re-prompt for VISUAL/AURAL after app upgrade"" into...

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

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



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