Merge changes I010309c5,Iefdf2f2a into nyc-dev am: 11cac9ce
am: 3213833d
* commit '3213833d':
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: I8825df2ddf8076eb1590d8d188ffb0083001a434