[automerger skipped] Merge "Add Bluetooth and Settings preinstallation...

[automerger skipped] Merge "Add Bluetooth and Settings preinstallation configurations" into udc-dev am: b89917c0 am: 6a099ab8 -s ours

am skip reason: Merged-In Ie074e206f7e387a8c4a65bbfc77b335473c6ae49 with SHA-1 6cf76bc9 is already in history

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



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