Merge "Make sure the removeObservers be called correctly" into sc-dev am: 766eff7df1

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

Change-Id: I8e7f11c28c9e76702f422e5153d250f5750e8138