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: 2e80d2d1

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



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