Merge "Simplify KeyguardBottomAreaView reinflation logic" into qt-dev am: eddef66903
am: 372557ff6f

Change-Id: Ia44fc10ec9641c6873641f1f6fc630933011288f