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

[automerger skipped] Merge "Adding native flag namespace for lmkd." into sc-qpr1-dev am: aeb139ac am: 76da258a -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/+/15787681

Change-Id: Ib421d12299be13090eac89188fdccfb5aa261d82