Merge "Do not back up brightness values - auto-brightness adjustment -...

Merge "Do not back up brightness values - auto-brightness adjustment - deprecated VR brightness" into tm-qpr-dev am: c5c15a09

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



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