Merge "Enable ds-docs-switched" am: 2e868b00 am: 120ef6b8 am: aa47f347

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



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