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

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

Change-Id: I6129ac4268ce64b4f41be8f59de73e4a17c802c2