Merge "Updated API documentation of screenWidthDp and screenHeightDp to include multiple-screen behavior." into tm-dev am: ea8489c0 am: d0e3b4d1 am: 817d06ef

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



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