[automerger skipped] Merge "SettingsLib: Add API to get identity address" am: 128ebcdb am: f2650c7f am: 32435083 am: a96aab98 -s ours

am skip reason: Merged-In Idd03d7777c8257986b03dd1ba19aac5514f4f18d with SHA-1 a393bf9d is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1952111

Change-Id: Ie63828786b17e3accb47360aefac2f6411f2355e