Merge changes I166f3d78,I026a8bb4 am: 589958c217

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

Change-Id: I78db0fcb3af6af6d54fd8697d010803f85d31951
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>