Merge changes I718f1da5,Iac53cbe0,I30a8f6c4 am: 07c60da5bf am: 080daf1906 am: dd3bb952f1

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

Change-Id: Ic6fe6aad5600ab436681e26c9768d5a61963d9bd