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

[automerger skipped] Merge "Adding native flag namespace for lmkd." am: 1fdacf63 am: eb10acc1 -s ours am: 5c822bf4 -s ours

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

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

Change-Id: If0ef305455e8bdcea799e5c901d8ecb786af4513