tree 04bda56c8f2abddbf24600ef06faf21af5c85005
parent 231ccd51ad7519cf10bbf1729c8c68b1d5ddebe0
parent 488c58f91b7481526d6d88c03564eae555310981
author Sorin Basca <sorinbasca@google.com> 1658296523 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1658296523 +0000

[automerger skipped] Use Mockito 4.6.1 API am: 488c58f91b -s ours

am skip reason: Merged-In I424015a4ec7e28c4775f7d2614d10d0958dcdb2e with SHA-1 231ccd51ad is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/TV/+/2151452

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