Merge "Additional LMK diagnostic information" am: f3aeac8f09

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

Change-Id: I6045fb5ecd45f58175393e9cc4b90c9a4064eae0