Merge changes I896e0bc8,I27231c4f am: 00a2b1f497

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

Change-Id: Ifa7d7ae638123ed7f8444729180a7d1b862f482c