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

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

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