[automerger skipped] Merge Android R am: 391c7fab8b -s ours am: 1ecf3b72dc -s ours am: 0f6f3e79e8 -s ours

am skip reason: Change-Id Ia4f3ce3113c6199975c391de8fbcf828cca63f13 with SHA-1 43b7ebf015 is in history

Original change: https://android-review.googlesource.com/c/platform/external/setupdesign/+/1422387

Change-Id: I8c99253c5a49c5c9ee6eb12014aad2c4b7fb1b8c