Merge changes I93fa880a,Ib036852a,Ic5ab3c04,I4452eacf am: 20909a93b0 am: afedf5268f am: 6bdddb9eb8

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1462704

Change-Id: I87ac274a0c1a61a9211af85965c188ac4b30965a
tree: 94eb412c687267e805ae5c04bd6c66bc20bf925b
  1. framework/
  2. service/