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

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

Change-Id: I0f706c1aa3855d47286076aac4850912a3a664a7