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

[automerger skipped] Merge "Adding native flag namespace for lmkd." into sc-dev-plus-aosp am: 6e6a94d0 am: ef43faed am: d04af4e0 -s ours

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

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

Change-Id: Ie22d8f858b8848317392ef21ee774f0b51288f2c