tree 29e2db443722e978afbc71681b6958fcf6b64f51
parent 1fdf6d4599c0a2373d743f8b963164a9ffb1e4e3
parent 1953ea490f4428532eb1e795c729e3875fac9d14
author chen xu <fionaxu@google.com> 1567023903 -0700
committer android-build-merger <android-build-merger@google.com> 1567023903 -0700

[automerger skipped] Merge "SDK API doesSwitchModemConfigTriggerReboot"
am: 1953ea490f -s ours
am skip reason: change_id If03e376ad0e91ad69f8444567700ed3fe76d66f6 with SHA1 c320f2cb37 is in history

Change-Id: I862d11ed7ce56e7742b7d77c9385a469046c16dc