Merge android-msm-floral-4.14 into android-msm-pixel-4.14

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