Fixed comments related to profile properties.

Change-Id: Idd6de8fe2a193a36cf1ea6bcadacb3289973c5ab
Merge "Fixed comments related to profile properties."
Choose CA certificate storage according to userId

Sets the default CA certificate directory at first instantiation so
that only certificates for the current user are searched.

This means that if one user decides to trust a CA no other user of the
device will be forced into trusting that CA as well.

Change-Id: Iaca14a94dd14c598e49a598290e1a80917269eac
Merge "Choose CA certificate storage according to userId"
Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt.

Change-Id: I1acb4d5df71daa47ea87813db3941fd3c676cfb5
Merge "Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt."
Merge branch 'master' of https://android.googlesource.com/platform/frameworks/base into kk-aosp-master