Merge "Keep secondary prox registered when covered." into rvc-d1-dev am:...

Merge "Keep secondary prox registered when covered." into rvc-d1-dev am: f7eacab7 am: c6b5fb65 am: d43376ee

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

Change-Id: If07ef4034b83e7db2885f99bb7252b1f6941da38