Bug:34697653 Test: build; existing CTS tests This version takes two parameters. Matches commit 164b6937 Change-Id: I0ef4b68f75dba5c58d3e2b53a13138d248cbab0d (cherry picked from commit 42e6a0b6)