M35 Gardening on Android

Upstream refactored ActivityState.java

https://codereview.chromium.org/159173002