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

Change-Id: Icbd5a14d90395269e0b2b75e331a0dca3405208d