Merge "Refactor Turbulence noise" into tm-qpr-dev am: ee663e2c am: 19d9e340

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



Change-Id: Iaa0d85fb652eaa840533d5cb6ec1d1a3117f3da5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>