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

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

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



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