Merge "Leave Prox registered when safe to do so." into rvc-d1-dev am: 2d6dae0e am: b4b6a907 am: 31b937ab

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

Change-Id: I616db76d2665bdb0c83831fca6ecc0b2aa2f28c5