[automerger skipped] ActivityManagerService: reroute lmkd atoms logging am:...

[automerger skipped] ActivityManagerService: reroute lmkd atoms logging am: 48f93dab am: 330d8a7c am: 488f8197 -s ours am: 6d21e675 -s ours

am skip reason: Merged-In I69ef1a9daa5532244a15665bff06d0ad6b370869 with SHA-1 26df817b is already in history

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

Change-Id: Ie3a8ea2cf3f352a411a078cddf4d65dea7fc2258