Merge changes I292b8e32,I689d0838 am: 1488a15856 am: cab292d695

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1686989

Change-Id: Ic61191f9de3a4f3c4615a54df283ff242c02193e