Merge changes Ibadc31b0,I5b453a68 am: 818ad18a25

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Bluetooth/+/1549975

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id0058ec84449f28e5a6f0e52c51c953fc081ea94