Merge "Modify call to Header function of Glif Layout to disable autosize" into...

Merge "Modify call to Header function of Glif Layout to disable autosize" into tm-qpr-dev am: 03ed8c04

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20472167



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