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

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

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