Merge changes I33b70b0a,I1074eedb am: 0714d122ac

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

Change-Id: I18869fe6bddd51f77068a91034b524f12c5a3450
tree: 9f5c72b8204a1881baabecb19901c886ba9dbab6
  1. core/
  2. services/
  3. tests/