Merge changes I8c2bb308,I384f309e am: 66aaab47 am: 9ad1c029 am: 403b6774 am: 8adc392d

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



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