Merge "Make screenshot process unbind correctly" into rvc-qpr-dev am: 8a912c716b

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

Change-Id: I63421e3e9672afb61842b75e9cc7a476cc3fb532