Merge "Disable ds-docs-switched" am: 673132ad6b am: cb01838b8b

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

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