[automerger skipped] Merge "Adds Assistant Handles learning state to backed up settings" into rvc-qpr-dev am: 01c000eff1 am: 6e8d9e5cb6 -s ours

am skip reason: Change-Id Ia1d5926621c4b45402036aaf06cbab19c12869bd with SHA-1 eec5673133 is in history

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

Change-Id: I2f149e6246d94f3e1509446dca41ca5ede189880