Merge changes I2703fb81,Ie95a70c2 am: d4aa87c5 am: 1b6ccc63 am: 6afdd442...

Merge changes I2703fb81,Ie95a70c2 am: d4aa87c5 am: 1b6ccc63 am: 6afdd442 am: beb1eead am: feea7b88

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



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