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

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

Change-Id: Ibaa1a783ab4e751c33f98efb1a24cd483255e433