[automerger skipped] Merge "BluetoothPairingRequest: Add null check for action" am: ed7662f6f6
am: 3366290e20
am: 5486a2fdd4
am: 785b480259
-s ours
am skip reason: Change-Id I24668e20accf96c7469c9e1ab589b1383ab59d18 with SHA-1 1805f666e7
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1372268
Change-Id: I6ad95d0325e6ec8d9ffe58a2ff6083518f5e1b61
This commit is contained in: