Merge "Merge "Improve LogAccessDialogActivity's rotation handling" into tm-dev am: ea71e9e9 am: 70b9c5e2" into tm-d1-dev-plus-aosp