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

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

Change-Id: I1b1cac8b9a86010b860a6dc092cb2259256e9209