Merge changes I9b5b2876,I3b93e0a9 am: 94a9ae334e

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

Change-Id: I05b63b429cd2da1f2ed5856a4d2d1593feac7484