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 am: e0cc8ee1

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>