DO NOT MERGE Fix android:noHistory for Wear
am: d7a313fb11

Change-Id: I4de91badcff2690e701d3c46edf3b06498b003ee