Merge "Check if ALWAYS_INLINE is already defined" into main am: 8097002e09 am: e7e3a9efb3

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

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