[automerger skipped] Merge "Revert "[DO NOT MERGE] Update constructor"" into tm-qpr-dev am: d2c50f5729 am: ec325c5aee -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SystemUI/+/21729059

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