tree 4272a4ac070341bfa286874b6b25f87f73d02cf1
parent b85bd3c15a35e8d7e3adec4d879a4c270e267187
parent 8efd95c41394fc560d08505a2b14c8a65a64679b
author Bonian Chen <bonianchen@google.com> 1574699160 -0800
committer android-build-merger <android-build-merger@google.com> 1574699160 -0800

[automerger skipped] Merge "[Settings] Fix conflict of AOSP merge on wifi call" am: 95e1c8d099 am: d7f0fb6cc1
am: 8efd95c413 -s ours
am skip reason: change_id Idb063bdab3d3b11c348804c1c0ecb268cca3068e with SHA1 2aafbd38e7 is in history

Change-Id: I55c5c96a2855c56bbc8c3dc46a0afea5909aafbf