Merge "Cache context for generateChallenge response." into tm-qpr-dev am: aeb042d9 am: d3b4bf7e

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19662253



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