am a351cda3: am a2138a34: Merge "Add setting to disable assist data (2/2)." into mnc-dev

* commit 'a351cda3':
  Add setting to disable assist data (2/2).
  Try not to crash while AppInfo is finishing
  Banish the memory page to Apps > Advanced
  Fix crash when removing fingerprint
  Fix bug #21025020 Stability: JCs in Settings: Caused by: java.lang.NullPointerException