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

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



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