Merge changes I3e765b8a,I8a64ad96 am: f369d9acc5 am: 6a3d69a5eb

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

Change-Id: Iab7521f12dea08bb87667de6257510405700793b