Merge changes from topic "native_hint" into sc-dev am: ea52c875 am: 9533a3db

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

Change-Id: If8502e41cbc2cf88b6ed9634741e57f066ab3652