Merge "Filter added or removed types by -ignore-linker-set-key" am: adc960d590

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

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