Merge "Separate fillsParent from deciding orientation" into tm-dev am:...

Merge "Separate fillsParent from deciding orientation" into tm-dev am: c416376c am: b434d861 am: 39ebef97 am: 90491a35

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



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