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

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

Change-Id: I426ed285d9c1db8a9240b53912831d64c43a7503
tree: e242d6868b92d556c97a6f80ce08a41097a19440
  1. framework/
  2. service/