Merge changes I5f58750a,Ifb74b312,I4eda926a am: 3ca69777c5 am: fd06bd3d5f am: 34d7de1dac

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

Change-Id: I95723409377cd354ba94bf09720ab6ffc2f5fa21