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

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

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