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

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

Change-Id: Ic5e6efa76873644a8fd73d626dcf12c608cd8287