Merge "Don't call setPowerBoost directly from native code" into main

                }

                gLastEventTime[eventType] = eventTime;

            }

            // Tell the power HAL when user activity occurs.

            setPowerBoost(Boost::INTERACTION, 0);

        }

        // Note that the below PowerManagerService method may call setPowerBoost.

        JNIEnv* env = AndroidRuntime::getJNIEnv();