Merge branch 'android-msm-wahoo-4.4-qt-security-next' into android-msm-wahoo-4.4-qt

OCT 2019.1
Bug: 137800028
Bug: 139157052
Signed-off-by: Adam Shih <adamshih@google.com>
Change-Id: Id6cfe6aa020ed49c3ff68140eee1267def7b1ccb