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