Merge "Pass Bitmap instead of ParcelFileDescriptor in UserManager" into jb-mr1-dev