Merge "Revert "DO NOT MERGE: Revert "Removing the initialising the mode with...

Merge "Revert "DO NOT MERGE: Revert "Removing the initialising the mode with system pref mode.""" into tm-qpr-dev am: b1f110a7

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



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