DO NOT MERGE: frameworks-test: adding missing @SmallTest am: cfcc1cb7bf  -s ours
am: 9f65f04157  -s ours

Change-Id: I717dbbd4d3ed657fec9ed9f45a5ae6f3e2a04b3e