Merge "Updated API documentation of screenWidthDp and screenHeightDp." am: ec2121901c am: d697c8b46d am: 6417364cfe

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

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