Merge changes I7782f95c,I7e553bd9 am: b6cf963be9 am: 5e7527dbd5 am: 4c6752c4c0

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

Change-Id: I9e8471c154d2b5e029670f8f89d721ce32986ea3
tree: 8dae65ce905f9e1c25288860ebac41e92e885ecb
  1. framework/
  2. service/