[automerger skipped] Merge "Add thread protection for Filter/Descrambler table Use weak reference in the tables to allow objects released by caller" am: d7275581e1 am: 6a62906e48 am: 1ee34508c3 -s ours
am skip reason: Change-Id I760d0a77ad9efe2709a14f0fb8a669f8f16652e1 with SHA-1 be8431c2ca is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1538202
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I914cca26d29314eb05e24be12bfd9c32de962af9
This commit is contained in: