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

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

am skip reason: subject contains skip directive

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



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