Merge "Renaming isAttemptingFactoryReset to new name" into main am: a9d3aef0fb am: cb0437d947

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

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