[automerger skipped] Merge changes from topic "new-size-spec" into tm-qpr-dev...

[automerger skipped] Merge changes from topic "new-size-spec" into tm-qpr-dev am: 3ef8a24a am: b15bcb0b -s ours

am skip reason: Merged-In Ie6c6f3bdbb939156cd0cbd1fb76e680592a9b426 with SHA-1 efd98e3e is already in history

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



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