Merge "Disable volume-key-accessibility shortcut upon exiting setup wizard"...

Merge "Disable volume-key-accessibility shortcut upon exiting setup wizard" into tm-dev am: 6fcd7dd7 am: 571c9e2d

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



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