Merge changes Ia2f891c2,Ibbe111b0 am: 53f9288870

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

Change-Id: I28281bd0123a2951f9522ecb58fc703bfb47f1df