Merge "Fix Accessibility button & gesture settings did not update correctly in...

Merge "Fix Accessibility button & gesture settings did not update correctly in Tablet device" into sc-v2-dev am: d920ef06

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

Change-Id: Ie144f0704648f098c9645907375b548c51457028