Merge changes I63739a0d,I62ec7bf0 am: b326ca5502 am: a111e64689 am: 2ffd270054 am: f27166c051

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

Change-Id: Id068a70dfc5772cad7234fcdd65bd0cf3e102dd4