Android 10.0.0 Release 0.36 (QQ1A.200205.002,taimen/walleye)
Merge branch 'android-msm-wahoo-4.4-qt' into android-msm-wahoo-4.4-qt-qpr1

Feb 2020.1

Bug: 145881853
Change-Id: I8873993aeab7edd5f8b30ba6b3e0002daad9a6a5
Signed-off-by: Harrison Lingren <hlingren@google.com>