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

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

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



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