Fix app upgrade related tests

It seems like test-breaking changes were introduced in ag/6410957

Test: make statsd_test && adb sync data && adb shell data/nativetest64/statsd_test/statsd_test
Change-Id: I4cf1c0396b8900d1faa500877df58c6d41479367