Merge changes I2ec97a17,I61aea43f am: 8d10ea37 am: 206a9e64 am: 16174396...

Merge changes I2ec97a17,I61aea43f am: 8d10ea37 am: 206a9e64 am: 16174396 am: 8c7b61bf am: 2a6a8e95 am: 46707824

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



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