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

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

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



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