[automerger skipped] Merge "Reset the settings key of the migration tooltips...

[automerger skipped] Merge "Reset the settings key of the migration tooltips as enabled." into sc-v2-dev am: 00d2cf50 am: 4da08a19 -s ours

am skip reason: Merged-In I1c877af7658781c32cddb2bb819013f1037409de with SHA-1 053a3e31 is already in history

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

Change-Id: I7902ab58138629504c226ef7e1f58547128780b1