Merge changes from topic "restricted-mode-cts" am: a96eeac8d6

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4015fa686b9511bfb89e4b6e3093def02d3eb9b1