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

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

Change-Id: I699137f0d809350aa53b7fff600b57a1359984d9