Merge changes from topic "int32ref" am: 2d29d2d82b am: 4212e4479f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8511efa59e8d8617f48d62ee52d9e7ae15458253