[automerger skipped] Merge "Do not back up brightness values - auto-brightness...

[automerger skipped] Merge "Do not back up brightness values - auto-brightness adjustment - deprecated VR brightness" into tm-qpr-dev am: c5c15a09 am: 1731d9fd -s ours

am skip reason: Merged-In I77189d4b201a28bcb2f950a0fd6ef94d21f49464 with SHA-1 512495cf is already in history

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



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