Merge "Prevents WearableExtender test from running on low API levels" into nyc-support-25.1-dev am: c7befa1183 am: 194f2625a3
am: d126936220

Change-Id: I6fd3daf3f01e199b59ec9c3496a2b355ce50745a