Merge changes I0e4fadd8,I9b3b1ffd,If7c74643 am: f76dca25c2 am: 41fc92c791

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

Change-Id: I25415139ba7e6661cce81416f9865429434800a4