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

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

Change-Id: If603bcea5b63900da2b6809da1a09cea6ff546da