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

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

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