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

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

Change-Id: I0c24efe98f7df564bbe85fdb059d87ef43219054