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

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

Change-Id: I7a88e00621cc7c6cb28a9baa2588ca8bf9c75564