Merge changes If71af5f7,Ic7861ac9 am: 3ea5fd2edc am: b1dc01ec4a am: 56294e27ce

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

Change-Id: I542fcb2e42d62f569f942cc6f3669c5fd083e416