Merge "[automerger skipped] java_sdk_library: Remove unnecessary qualification...

Merge "[automerger skipped] java_sdk_library: Remove unnecessary qualification of fields am: c5d954a4 am: d74b3b0b am: 0f7ab920 -s ours" into rvc-qpr-dev-plus-aosp am: 25b87a10 -s ours

am skip reason: Change-Id I84f294c6f02d5089055130c63f5fb0538a1f21b9 with SHA-1 c5d954a4 is in history

Change-Id: Ib09c2b105c0fb7494d5581c81e8a07f857268fbf