[automerger skipped] Merge "Deprecate GATT callbacks and methods that were not memory safe and replace with memory safe versions." am: eb806924d6 am: f9960bd169 am: c59fe0168f am: e00ce9b39a am: b22dd98d18 -s ours
am skip reason: Merged-In I5ae604ec20febcf646bfe6a8f866b218448349c1 with SHA-1 3901dc6bf3 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1858070
Change-Id: I4852a84bb48dcd15904e250099fde6fdf7e651da
This commit is contained in: