Merge branch 'android-msm-pixel-4.9-qt-security-next' into android-msm-pixel-4.9-qt

SEP 2019.1
Bug: 136171028
Bug: 136170907

Change-Id: I4bd4bc4871e70d94e47dda2f4d4966d6a4e0e3e7
Signed-off-by: Wilson Sung <wilsonsung@google.com>