Merge "[Sb refactor] Ignore old pipeline callbacks to removeIcon*" into tm-qpr-dev am: ff1e610f

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



Change-Id: Idb6c22fe7c7c05404b6c25c157143be4cae77034
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>