tree 04bda56c8f2abddbf24600ef06faf21af5c85005
parent 69c63042e0f8abb7c3679ebd751329612764df84
parent c00dd4cf817b803447759ddad9f1c6222f622542
author Sorin Basca <sorinbasca@google.com> 1658298373 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1658298373 +0000

[automerger skipped] Merge "Use Mockito 4.6.1 API" am: f5fb8846f1 -s ours am: c00dd4cf81 -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: I6a95a8563a630c0b4d406b453496879ee11c0aef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>