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

Change-Id: I3715b2fb1045b7bfce7f52e9b4982fcc0218d28c