Merge "Simplify the content layout of the DrawerLayout demo." into mnc-ub-dev
am: 38a34c05f7

* commit '38a34c05f7a924f60e8ff1a5fc68479f12e9aabb':
  Simplify the content layout of the DrawerLayout demo.