Merge "Filter added or removed types by -ignore-linker-set-key" am: adc960d590 am: 7995aca67b am: 152264e539 am: 79fa7d3ecf

Original change: https://android-review.googlesource.com/c/platform/development/+/2223129

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