Merge changes I6d5dd0a8,I106b3e4f am: 0cf3234045

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

Change-Id: Ife29dba8549f9b86cfe757a59fd4c8e61e55738f
tree: 675beae8956bc922ed9fb8c0fe79b641ceca198d
  1. core/
  2. services/