Merge "Controls UI - Do not update while drag in progress" into rvc-dev am: a7143d54c7 am: 4d971a7ab7

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

Change-Id: I55be2a6054e421d2472ab7bbb4a7e777f455b1de