[automerger skipped] Merge "Make sure the removeObservers be called correctly" into sc-dev am: 766eff7df1 am: db108bdf5f am: 819d63139f -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: Ia3b4dd3c4e6348500d91d71df5e8098cff8da0c6