Merge changes Ia3eae81c,Iff44fb23 am: 372c4810 am: a7459772 am: e3435c4c...

Merge changes Ia3eae81c,Iff44fb23 am: 372c4810 am: a7459772 am: e3435c4c am: fe035c98 am: 985fe6f1

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



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