Revert "mockito: work around re-entrant stubbing of android.os.P..."

Revert submission 3500336

Reason for revert: Droidmonitor created revert due to b/397769063, b/397768983. Will be verifying through ABTD before submission.

Reverted changes: /q/submissionid:3500336

Change-Id: Ia095cdc417572d9dba7daf46e91c5ee997e1c0ac
2 files changed