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

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

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