Merge changes If71af5f7,Ic7861ac9 am: 3ea5fd2edc

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

Change-Id: I7270ecd8f67bbcb1cec90906a39dfe4b4b4998e0