Merge "Merge "Log FGS ENTER event synchronously." into sc-dev am: 9515d87d...

Merge "Merge "Log FGS ENTER event synchronously." into sc-dev am: 9515d87d am: b825d204" into sc-v2-dev-plus-aosp am: 5c5f973a

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

Change-Id: I8d11e49a164ed5c845e5915e4dd6420e7b695e8c