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

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



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