Merge changes from topics "ota-apex-list", "otapreopt-linkerconfig" am: 8a3d4d4ea1 am: 0719cf547b

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1619561

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ief2851c81e3358d0ad0537a8c0725aace4a29d6c