Merge changes from topic "permTree-sc-dev" into sc-qpr1-dev am: 45647e1d4d am: de697d133e am: 4b8a858cda am: e0cc8ee109

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

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