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

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



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