Merge "[automerger skipped] Merge "Make sure the removeObservers be called correctly" into sc-dev am: 766eff7df1 am: 7afe2f3723 am: 509675dea0 -s ours" into sc-v2-dev-plus-aosp am: a21d61b4f7 -s ours
am skip reason: Merged-In Iec1eb82d1a4756a7b85c8fbdd05f4132a74c613c with SHA-1 7141ab2619 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15747424
Change-Id: I18c936bc2799b24210a57d5ec949080e9feb3117
This commit is contained in: