[automerger skipped] Merge "Store pending override config instead of creating ActivityClientRecord" am: 1a0d8de382 am: 047f71a116 -s ours am: c3822079a1 -s ours
am skip reason: Merged-In If350e942254e54c9ec90bc63a6e50eb67d038183 with SHA-1 6b104eec9a is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2128414
Change-Id: If83f66eaeec787c007a4f27f8cf291099f5e9213
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: