Merge "Prevent app bar title from drawing twice" into sc-dev am: 50129cc4

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1bc2a8e201e3e2e1b42155dee8646a5986b0c8e5