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

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

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



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