[automerger skipped] Merge "Revert "Unregister callback on unregisterAppUid.""...

[automerger skipped] Merge "Revert "Unregister callback on unregisterAppUid."" into tm-qpr-dev am: 59997cae -s ours am: 4fbcda18 -s ours

am skip reason: Merged-In Ib0065cc4d85bbd914b07f17080227ada969cbb44 with SHA-1 c068aafa is already in history. Merged-In was found from reverted change.

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



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