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

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

Change-Id: Ib41b1c0347d440c0537ee157fe03327a03a1e3d2