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

[automerger skipped] Revert "DO NOT MERGE: Revert "Removing the initialising the mode with system pref mode."" am: 2a4e18f7 am: 1d414a4f -s ours

am skip reason: subject contains skip directive

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



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