Merge "Add missing SmallTest annotations in frameworks/base/wifi"