Merge changes I4894c2dd,Id2977f05 am: 22a54f6a5f am: 1cfbd1bce8 am: 8b56fe841b

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

Change-Id: I2721bddbd389b00cdf6472a241f4b75cc02702f2