Merge "Add linker_set_key to RecordTypeDiff and EnumTypeDiff" am: cc90871286 am: 7c5e16840f

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

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