Merge "Switch away from std::async for proximity-active callback." into sc-dev am: c6ad94b675

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

Change-Id: I8fc63855412fd3d061c8d0f1e61e9072373d14af