Merge "Additional LMK diagnostic information" am: f3aeac8f09 am: 6a6ad9af99

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

Change-Id: Ie90648747a83b97b79061d8d6af48df3f128c67d