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

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

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