Merge "Merge "Move HapticSettingObserver to companion object." into rvc-dev...

Merge "Merge "Move HapticSettingObserver to companion object." into rvc-dev am: f6795b10 am: 0c8600f3" into rvc-d1-dev-plus-aosp am: 0182b831 am: 7d17b0e6

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

Change-Id: I30a0238cfdbf2f74fa90071172f7ccfe5ad825a1