Merge changes Ic46ac54b,Id787e70f am: dfb9cd9d50

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

Change-Id: I4e77ef33751d5d0d3463e59fd0a3cdcd7d46bf73