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: Ib93b92ee9ed7c61c4b9a3e70ec0e810624e6a4e0 Signed-off-by: Wilson Sung <wilsonsung@google.com>