am 89e762c3: am 5b3cd2cc: am d968d1a2: Merge klp-dev-plus-aosp into stage-aosp-master

* commit '89e762c35c1cdadf410cf7aa5637a2f8cd1d1066':
tree: 3eb3f927cd293cb702e9c1d99c28fbaf2b70ebc3
  1. InCallUI/