Merge "Controls UI - Do not update while drag in progress" into rvc-dev am: a7143d54 am: 4d971a7a am: 4d6f41d6

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

Change-Id: I783dbff562ff3921e585f1ed1a04bd179a1c512a