Merge "Keep source ID into native object" into sc-dev am: 6777f05b2d

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idaf764af5e914f4bdd56c00c32217ed4fb8edf85