Merge changes from topic "am-ccc4505a2deb4da4ba671c9aeb35cc71"

* changes:
  [automerger skipped] Merge changes from topic "cherrypicker-L91600000957583311:N61400001316745756" into tm-qpr-dev am: b6c8f9e5 am: 56782f44 -s ours
  [automerger skipped] Fix NullPointerException for stopAdvertisingSet() am: 600bfdb0 am: 6efaf8f3 -s ours
  [automerger skipped] Fix the BT settings is crashing after Toggle OFF/ON am: 894aa6dd am: 0e10220d -s ours
  [automerger skipped] Add Bluetooth LE advertising logger am: a3dcfa6b am: 27648b1e -s ours