Merge "Add back non-ravenzier part of bivalent device side test" into main am:...

Merge "Add back non-ravenzier part of bivalent device side test" into main am: edf2992f am: 16844470

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



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