am 888e507b: (-s ours) snap to klp-dev-plus-aosp 19b13b9 with history

* commit '888e507b9756d0a572944ee81e80ffa08797b79d':