Merge "Force an initial event to be sent to ProximitySensor." into sc-dev am: 831b21f456 am: 4bbc2bc9f4

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

Change-Id: I882361fce1b2140b10000b018b20add5d3108151