Merge "Merge "Fixed the reference to the compat version of the widget. Revised the class description." into tm-dev am: 96d92cfe am: 86fec4c5" into tm-d1-dev-plus-aosp am: e8f4a343 am: 2f1bd0ca

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



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