Revert "Fix failing testSlicedStateCountMetric" This reverts commit e9372b0c8d11f98fa711103c362124d853eda7f3. Reason for revert: Droidcop-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=git_rvc-dev&target=test_suites_arm64&lkgb=6825950&lkbb=6826041&fkbb=6826041, bug 168241007. Bug: 168241007 Change-Id: I6f214a94af39e652564912a832873e752947bd86 (cherry picked from commit 9dedc0306a91cef22cd11e552e44f98ee424096e)