Merge changes I010309c5,Iefdf2f2a into nyc-dev
am: 11cac9c

* commit '11cac9cead4e7c68d25c0b6f93387eb4dc1ae3e1':
  Set status bar color to material_blue_grey_950 as specified by UX.
  Revert 'Make Files drawer appear behind system ui bars' because of action mode bug

Change-Id: I5a4aab23f4f15775986df78795b07ce7f2331f3d