[automerger skipped] Merge changes from topic "int32ref" am: 2d29d2d8 am:...

[automerger skipped] Merge changes from topic "int32ref" am: 2d29d2d8 am: 4212e447 am: c455df11 -s ours am: 6d56b6db -s ours

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7f71c2b828e2c43ca204fb6d9eee2d51eff53bc1