Merge "Merge "Add screenSize and smallestScreenSize to manifest" into...

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

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



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