Merge "Merge "Add null check for intent in AppPermissionPreferenceController" into rvc-dev am: bb7a65a19b
am: 27a4a17aac
am: 8d56f7127d" into rvc-qpr-dev-plus-aosp am: 5ca17dfebb
Change-Id: Idda453aa936021240cb9cd10030275cd0f47e1d7
This commit is contained in: