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

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

Change-Id: I8680a7371125355ba758564d0ee3762c67c35100