Merge "Fixed an issue where the footerview and others would fly over the screen" into sc-dev am: 6e76e995 am: 42a04d2f

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

Change-Id: Iec1cf34baf1af9d17e57dec6e879816c95446fad