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

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



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