Merge changes I9b5b2876,I3b93e0a9 am: 94a9ae334e am: fc87fc210a

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

Change-Id: Ie4e84581e417b39b6a0b81b4e1d0864e731bce46