Merge "Fix initialization of USER_ROTATION setting." am: 13466883b0 am: 9768739095 am: 12824746c7

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I46f427425d871b8dc44a792ca6bc9ed395ca2faf