Merge "Merge Security Patch Level-2018-09-05 from mirror-aosp-pie-platform-release" into p-keystone-qcom