[automerger skipped] Merge "Adding native flag namespace for lmkd." into sc-dev am: 291f266c99 am: 52e69a4b94 -s ours
am skip reason: Merged-In I1f13d6bbb4a9a7fd8825d7e5acde416750271df4 with SHA-1 da3fed0b47 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15739022
Change-Id: I40cd16e2b2f77806d3a19da8249a53ece1fe8fe6
This commit is contained in: