Merge "SF: wait instead of presenting early" into sc-dev am: 344d6a62db

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

Change-Id: I9224bb3caeee827493d87df72eafd2efb8f655d3