Merge changes I5ed1bc8b,Ie9e6af0e am: 834026197f am: 5a4bd548f1

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

Change-Id: Ia0f9ad67aaf675e8190d52e5814dbe855021a8b3
tree: c74df5276e0a27b19fb32dbf7338a028bb63def8
  1. core/
  2. services/