[automerger skipped] Merge "Remove FastNative annotations on synchronized methods." am: e6db6b21 am: 09f48341 -s ours am: 55e3b2fb -s ours

am skip reason: Change-Id I1e34c78a8438c67e5a1bedb83eb977389ee9a82d with SHA-1 498aa129 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519499

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia5e610790fe2267558425691cd680739c87c4818