Android R Preview 1 (RPP1.200123.016)
Merge changes from topics "dm-default-key-v2", "metadata_cipher"

* changes:
  Set metadata cipher in fstab
  Add support for v2 of dm-default-key