Merge "remove update-super" into main am: f9b23ef4d0

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3498049

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