tree 870146a1d9d9a9aefe5d861d90288e44d0148a6d
parent da1b71b19afb33112a0062d400b45f5dcbf294e7
parent 8610e52994d374a4e67801f76ad0b20f6f5a7da2
author Hall Liu <hallliu@google.com> 1563320161 -0700
committer android-build-merger <android-build-merger@google.com> 1563320161 -0700

Merge "Inform ServiceStateTracker of airplane mode changes" am: 2b38599045 am: 0de70cba5e
am: 8610e52994

Change-Id: I7a7888601c464b005e4dba0d755bc8b8491111b7