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

Change-Id: I0757bad9e74f79ad3e355feb0dcbfb698e41b7df