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: 064867a9 am: 7661e793

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

Change-Id: I4e06bb3d168b974ebb9962daffbcd6aac7a55390