am 2145a613: Merge branch \'lmp-dev-plus-aosp\' of https://googleplex-android.googlesource.com/_direct/platform/system/core into lmp-dev-plus-aosp

* commit '2145a6137e77c683bd5f98c7bb20805bc5cc8cb7':