Merge "No longer call registerNativeAllocation" am: 0272e96327 am: e8d010e9ec am: 0c42ad0ca7 am: be1e8edca3

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I863a21ce57a541fd5fdfe13cabdba8c21e0be0a0