Merge "Fix fillsParent() always be false on finishing activity" into rvc-dev am: 838475b6 am: 423d7c62

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

Change-Id: I7e7c66ee4f99e92ae6b62d08fec1b36cba91d9b5