Merge "Remove unnecessary keyword setting" into main am: fad3b2fb am:...

Merge "Remove unnecessary keyword setting" into main am: fad3b2fb am: d9e8e566 am: f78b38bb am: d53debca

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



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