Merge "Merge "Merge "Docs: Fixed typos in attribute descriptions." into...

Merge "Merge "Merge "Docs: Fixed typos in attribute descriptions." into udc-dev am: 838ba329" into udc-dev-plus-aosp am: b0ff8a0f am: c48def7c" into udc-qpr-dev-plus-aosp am: ba133434

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



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