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

Revert "DO NOT MERGE: Revert "Removing the initialising the mode with system pref mode."" am: 2a4e18f7

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



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