Merge changes I3e765b8a,I8a64ad96 am: f369d9acc5

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

Change-Id: I9d4133cbd2da5f152d493d72fa1a78c8dcf8bc86