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

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

Change-Id: I8a56f40fa2f5a91bf7f9bc922e32be9fe55f4e36