[automerger skipped] Merge changes from topic "int32ref" am: 8437d37bd0 am: 947f8c8acf am: 541fc05fd4 -s ours

am skip reason: Change-Id I9b63146ae563ed977f3112c9910f7a7c575de0b8 with SHA-1 9067134008 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566390

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8cfca5ee873f7b1eb8bba76d63af6b66b0f453e4
tree: 29702f8bd2b708eccb01376800aa15869452daa4
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS