Merge "Enable Credential Manager for all handheld devices" into main am: d5f7cb16

Original change: https://android-review.googlesource.com/c/platform/build/+/3146957



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