Merge "Add screenSize and smallestScreenSize to manifest" into tm-qpr-dev am: 66338519

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



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