[automerger skipped] Merge "Merge "GpuStats: fix driver loading stats at driver unloading" into qt-r1-dev am: 2a7a3bfe am: 6db8d557" into qt-qpr1-dev-plus-aosp
am: 023d8ba1 -s ours
am skip reason: change_id I1e74cf55dd00f6fd7cb65d278d4dbaf018c5f322 with SHA1 8238fa04 is in history

Change-Id: Icbbf6150bc0baaa7bc055b491c3ea1dc892c5c6a