Merge "Add new API for new feature of display name." am: e43f70afc7 am: bacd6a4a11 am: 93e2d21187 am: aa6e8fff87

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

Change-Id: I28ae3bf23808bca60b474969f4a0b90e9747e682