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

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



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