Merge "Remove unnecessary keyword setting" into main am: fad3b2fbad am: d9e8e5665a am: f78b38bb76

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

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