[automerger skipped] Merge "Adding native flag namespace for lmkd." into...

[automerger skipped] Merge "Adding native flag namespace for lmkd." into sc-dev am: 291f266c -s ours am: ed0f4c85 -s ours am: 21ad4524 -s ours am: 9f07f7d0 -s ours

am skip reason: Merged-In I1f13d6bbb4a9a7fd8825d7e5acde416750271df4 with SHA-1 da3fed0b is already in history

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

Change-Id: I5529b827e247d4a94d33edd99f10001da8ba5c40