DO NOT MERGE Fix android:noHistory for Wear am: d7a313fb11 am: 6a860f7f3b
am: a872ce0c59  -s ours

Change-Id: I326b0a6f8995c12c1350ee179c1f1f951c93818c