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

January 2019.1

Bug: 118156121
Change-Id: I4acee346c1951753c3536da2837434e2a5482732
Signed-off-by: Robin Peng <robinpeng@google.com>