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

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

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