Merge "Update string for message of DirectBootWarnDialog" am: b0cc3a6c7d
am: 662e59e628

Change-Id: I58f28cc3473c72c2061cc4c90cc6a2d50812e670