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: Ia24326d6b43ca86e46511ebdaaee9718af701e98