Adjust tests to new android-support-test + espresso libraries.

(cherry picked from commit 85544ba5eb3642976ea0f85fb9e86401661afc2b)

Bug: 69455082
Test: make tests
Change-Id: I563776a0dd821af4abba47df79e14c255097836d
Merged-In: I7a41199cd7f0739f660a49b1af32e64f58590301
4 files changed