Merge "No longer call registerNativeAllocation" am: 0272e96327 am: e8d010e9ec

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I55dba34e9de72cc288c838609638bb0ccb67e7c4