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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib608dea32b4f2dd2a865e94fa0a363ced24f19a8