am af71f2ac: am 44120d19: Merge "Avoid re-creating a user when activity is resumed" into jb-mr1-dev

* commit 'af71f2ac9423918be8ac1191df9c223a2744bb38':
  Avoid re-creating a user when activity is resumed
Always-on VPN.

Adds support for always-on VPN profiles. Users pick an always-on VPN
from list of existing VPN profiles, which must use an IP address for
both VPN server and DNS.  Moved "add" operation into action bar.

Bug: 5756357
Change-Id: I4c7ed7f2a3b027be1baf65c08213336a61f3acfe
merge in jb-mr1-release history after reset to jb-mr1-dev
Merge "Always-on VPN." into jb-mr1-dev
Import translations. DO NOT MERGE

Change-Id: I61710e208f305569f238c02cc7aa8a3da8a0154b
Auto-generated-cl: translation import
Import translations. DO NOT MERGE

Change-Id: Id789c1dba9f7f331cf985d1470a68161e770ac84
Auto-generated-cl: translation import
am da40470d: Merge "Always-on VPN." into jb-mr1-dev

* commit 'da40470daae8c71fe3144970e7bb5b0d32ec6b9d':
  Always-on VPN.
am d1dbff36: am da40470d: Merge "Always-on VPN." into jb-mr1-dev

* commit 'd1dbff362193c428bab38f189a041058650a7904':
  Always-on VPN.
Merge "Import translations. DO NOT MERGE"
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
am 786aacb7: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '786aacb79657a69f16840bff8b5862c6415d08bd':
  Import translations. DO NOT MERGE
am 8e891823: (-s ours) am 786aacb7: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '8e89182392e867b35729d01c4e3e45f5dff6d7f9':
  Import translations. DO NOT MERGE
Enable to delete a stored persistent group from p2p settings.

Enable to delete a stored persistent group from p2p settings.
The multilingualization has NOT been done yet.

Change-Id: I84bd89343c9e3ce5e62b8b96dfce9d286675b145
Signed-off-by: Yoshihiko Ikenaga <yoshihiko.ikenaga@jp.sony.com>
merge in jb-mr1-release history after reset to jb-mr1-dev
Merge "Enable to delete a stored persistent group from p2p settings."
am 38ce5194: Merge "Enable to delete a stored persistent group from p2p settings."

* commit '38ce5194e89b83697466abe2994016507109ec54':
  Enable to delete a stored persistent group from p2p settings.
am 300457ba: am 38ce5194: Merge "Enable to delete a stored persistent group from p2p settings."

* commit '300457bad289f547430da21e72747e8840840832':
  Enable to delete a stored persistent group from p2p settings.
am 72d3f85d: am 300457ba: am 38ce5194: Merge "Enable to delete a stored persistent group from p2p settings."

* commit '72d3f85d09fd900004956b60e7e93997ba8b1025':
  Enable to delete a stored persistent group from p2p settings.
Merge "Fix memory leak in ApnSettings-activity"
am 2d6b52bd: Merge "Fix memory leak in ApnSettings-activity"

* commit '2d6b52bd38046abe1761cf0cc1f0c415e4a24fef':
  Fix memory leak in ApnSettings-activity