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: 6047ecbd am: 9c7e18d9

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



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