[automerger skipped] Merge "Fix setting hidden api usage log sample rate" into qt-dev-plus-aosp
am: 58621c81c3 -s ours
am skip reason: change_id I8a5534403269a2339fcabc8f847199ab837ae71b with SHA1 b019c7eea3 is in history

Change-Id: I179a283870da57d1739883d948cb0b435ae30ee2