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

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

Change-Id: I513cda8275615002f52163c6e51a817f5863d562