Merge android-msm-sunfish-4.14-qt into android-msm-pixel-4.14

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