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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I57f1590e333e23b22dbd38f1ce14fc15be411de6