[automerger skipped] Merge "Take local copy of CallbackProtector in Callbacks" into main am: 094799c58d am: 5e604d6fbb -s ours

am skip reason: Merged-In Icdd6179e04d339425a2ecf586d198ed236edd7c8 with SHA-1 9f580a6fd8 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/wilhelm/+/3255166

Change-Id: I9c3ce97d8fb1d0df8d01c85419e0e5016ed666f3
Signed-off-by: Automerger Merge Worker <[email protected]>
tree: ee6e53c0ec946586c0540b0da3cadc573f0a68d8
  1. doc/
  2. include/
  3. src/
  4. tests/
  5. tools/
  6. Android.bp
  7. OWNERS
  8. TEST_MAPPING