Merge "Include calling uid proc state in CameraService reject log." into qt-dev am: a74c727406
am: ea547ec252

Change-Id: I3ac4ed7d4cfdc2dfba18e99d851569098e1db664