Merge changes I166f3d78,I026a8bb4 am: 589958c217 am: c2e8b2812d

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

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