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

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

Change-Id: I4114e57a02314ebc82144015d673ca91699707b2