Merge changes from topic "int32ref" am: 8437d37bd0 am: 947f8c8acf

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8511efa59e8d8617f48d62ee52d9e7ae15458253
tree: 2630f99103c959812a88b5a8387da53a4871c33e
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS