[automerger skipped] Merge "Add READ_DREAM_STATE to the settings list" into...

[automerger skipped] Merge "Add READ_DREAM_STATE to the settings list" into rvc-qpr-dev am: d9541fb8 am: 814227a0 -s ours

am skip reason: Change-Id I5da006b7c88dc36d3eefebc559f2a2f3ab50823f with SHA-1 8a888b97 is in history

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

Change-Id: I4831d3a74cfe2171968a0a729e830a70789002b1