[automerger skipped] Merge "Adding native flag namespace for lmkd." into sc-qpr1-dev am: aeb139aca5 -s ours am: a4c994a120 -s ours

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

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

Change-Id: I985730e0e890d145b2cc19866b45a84363c9090c