Merge "Reset tooltip preference to fix flaky test." into sc-dev am: 59cc9212 am: cfd39712

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15273833

Change-Id: I0e6808c74191b72f675f0bcb441f489cf555b39e