Merge "Add AConfiguration_getScreenRound." am: c44bffa46a am: 7a93b588c0

Change-Id: I595b3dc5c13618f2e739d9388d5ee57e5f82a7ac