DO NOT MERGE Fix android:noHistory for Wear am: d7a313fb11 am: 5207e1cff1
am: 3dc8814e04  -s ours

Change-Id: I149a8cc8b1f380093cc4668f6c9a338e64dd7776