Merge changes from topic "native_hint" into sc-dev am: ea52c875 am: 2194851f am: dfa32b6b

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

Change-Id: I99ff9776fc736ca305d2b833dab05c2ab13718dd