[automerger skipped] Merge "Make MODIFY_DAY_NIGHT_MODE and OBSERVE_APP_USAGE...

[automerger skipped] Merge "Make MODIFY_DAY_NIGHT_MODE and OBSERVE_APP_USAGE permissions grantable via role." into udc-qpr-dev am: 894a8d6e am: 19f6a688 -s ours

am skip reason: Merged-In Id8880eeb44070faebd79ab59cdd6a036898821cf with SHA-1 65366588 is already in history

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



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