Revert "Revert "Adjust monkey to changed internal APIs""

This reverts commit ac5c451ac496f645a3ab01828eaaded80ad8bea0.

Test: 1:1 revert-revert
Bug: 136595429
Change-Id: I9b941d1b26d022568b3046a5f0de815c66f7d504
2 files changed