Merge changes from topic "permTree-sc-dev" into sc-qpr1-dev am: 45647e1d am: de697d13

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



Change-Id: Ib8a6ec70927fc7bf26268504023996b82ac0c62c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>