[automerger skipped] Merge "Store pending override config instead of creating...

[automerger skipped] Merge "Store pending override config instead of creating ActivityClientRecord" am: 1a0d8de3 am: 047f71a1 -s ours am: c3822079 -s ours am: 2b0fb4f8 -s ours

am skip reason: Merged-In If350e942254e54c9ec90bc63a6e50eb67d038183 with SHA-1 6b104eec is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2128414



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