Merge changes from topic "native_hint" into sc-dev am: ea52c87596 am: 2194851f5c

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

Change-Id: If0a6ed03108a1ae793cbba0abcdd78e6331c25b3