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

FEB 2019.1

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