Bug: 37672383 Change-Id: I63adcafc6e8dced173d52f25e8a6521ae897c9aa Test: builds
Bug: 30742121 Test: Run EncryptionInterstitialTest via `am instrument` Change-Id: I04d304da4153ebc7f8809ce9c640bccc5e1f5685 (cherry picked from commit 9be96e06bb)
9be96e06bb
Pref tree handler cannot assume preference has non-null key. Change-Id: I790e75f3b4c888e2a48b297bea89cda0b8dbaabd Fix: 35855587 Test: runtest --path tests/app/src/com/android/settings/EncryptionInterstitialTest.java