Merge "[automerger skipped] Merge "DO NOT MERGE Allow keyguard_message_area_container to be null" into sc-v2-dev am: 6f989effda am: 64c9114bce -s ours"