[automerger skipped] DO NOT MERGE: Fix ActivityView surface can't visible for ActivityViewTest am: dc9b319039
am: 290d6f3546 -s ours
am skip reason: subject contains skip directive

Change-Id: I4e7f5354cb4b8305f768e20a6a83ffb9aaf18f84