Merge "Fixed an issue where the footerview and others would fly over the...

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

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

Change-Id: I8c5858db7f268522b7e41f3b8d852214b7432d88