[automerger skipped] Merge "Make sure the removeObservers be called correctly"...

[automerger skipped] Merge "Make sure the removeObservers be called correctly" into sc-dev am: 766eff7d am: db108bdf am: 819d6313 -s ours am: 3259e1cf -s ours

am skip reason: Merged-In Iec1eb82d1a4756a7b85c8fbdd05f4132a74c613c with SHA-1 7141ab26 is already in history

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

Change-Id: I17827853afe506f857a005668ea518c5ee23b4bf