Merge changes I3320d992,I655cf2c2 am: c8370a9c9f am: 5a52bcc740 am: 3bf4a47216

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

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