[automerger skipped] Merge "Use the ?= operator so BT properties can be overridden" am: e4a5a19b77
am: 249302343c
-s ours am: 0c750bfcc8
-s ours
am skip reason: Merged-In I45b1786f5556ba3e7d493ea17dc955cd317a1156 with SHA-1 3cb7308fd5
is already in history
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2079814
Change-Id: I3b6bb6ab120dfce9115d82f94cf8215d6aaf321d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
560760c8a9