Merge "Make MODIFY_DAY_NIGHT_MODE and OBSERVE_APP_USAGE permissions grantable...

Merge "Make MODIFY_DAY_NIGHT_MODE and OBSERVE_APP_USAGE permissions grantable via role." into udc-qpr-dev am: 894a8d6e

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



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