[automerger skipped] Merge "Add pan sysprop for nap" into tm-qpr-dev am:...

[automerger skipped] Merge "Add pan sysprop for nap" into tm-qpr-dev am: 2ca1fc3e am: a2f81516 -s ours

am skip reason: Merged-In I27f9ec11fd4ef50ce2f66e3329dc0394257bcc2e with SHA-1 a786e247 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/21796116



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