Merge "Don't re-prompt VISUAL/AURAL after app upgrade #2" into tm-dev am: d5eda4bc am: 3a5c302a

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



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