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

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

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