[automerger skipped] Merge "Revert "DO NOT MERGE: Revert "Removing the...

[automerger skipped] Merge "Revert "DO NOT MERGE: Revert "Removing the initialising the mode with system pref mode.""" into tm-qpr-dev am: b1f110a7 am: de10a87c -s ours

am skip reason: subject contains skip directive

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



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